bitkeeper revision 1.1159.103.4 (4174f7e2hKsMImqYnCGV37xqvR-IWw)

Don't do check for kernel image existing if restoring.

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index dad6c5b452b86321d897d03fb7659ac550bd3244..287d8b2e56aad92cec5ecd44ab139d96854c1652 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -710,6 +710,10 @@ class XendDomainInfo:
         """Build the domain boot image.
         """
         if self.recreate or self.restore: return
+        if not os.path.isfile(kernel):
+            raise VmError('Kernel image does not exist: %s' % kernel)
+        if ramdisk and not os.path.isfile(ramdisk):
+            raise VmError('Kernel ramdisk does not exist: %s' % ramdisk)
         if len(cmdline) >= 256:
             log.warning('kernel cmdline too long, domain %d', self.dom)
         dom = self.dom
@@ -735,11 +739,6 @@ class XendDomainInfo:
         @param ramdisk: kernel ramdisk
         @param cmdline: kernel commandline
         """
-        if not self.recreate:
-            if not os.path.isfile(kernel):
-                raise VmError('Kernel image does not exist: %s' % kernel)
-            if ramdisk and not os.path.isfile(ramdisk):
-                raise VmError('Kernel ramdisk does not exist: %s' % ramdisk)
         #self.init_domain()
         if self.console:
             self.console.registerChannel()